Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix UnrecoverableError: Invalid MergeFlag: 1 #2416

Merged
merged 2 commits into from
Jan 2, 2025

Conversation

yangzq50
Copy link
Contributor

What problem does this PR solve?

Fix bool TxnTableStore::CheckConflict(const TxnTableStore *other_table_store) const

Issue link:#2388

Type of change

  • Bug Fix (non-breaking change which fixes an issue)
  • Refactoring

@yangzq50 yangzq50 added the ci PR can be test label Dec 30, 2024
Copy link
Contributor

@small-turtle-1 small-turtle-1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@yangzq50 yangzq50 added ci PR can be test and removed ci PR can be test labels Dec 30, 2024
@yangzq50 yangzq50 force-pushed the fix_Invalid_MergeFlag branch 2 times, most recently from 05e3a96 to dbcfe1c Compare December 31, 2024 05:06
@yangzq50 yangzq50 added ci PR can be test and removed ci PR can be test labels Dec 31, 2024
@yangzq50 yangzq50 force-pushed the fix_Invalid_MergeFlag branch from e9c6567 to ff95fc8 Compare December 31, 2024 09:00
@yangzq50 yangzq50 added ci PR can be test and removed ci PR can be test labels Dec 31, 2024
@yangzq50 yangzq50 force-pushed the fix_Invalid_MergeFlag branch from c48b75b to 3c7ddfc Compare January 2, 2025 06:59
@JinHai-CN JinHai-CN merged commit d48860a into infiniflow:main Jan 2, 2025
4 checks passed
@yangzq50 yangzq50 deleted the fix_Invalid_MergeFlag branch January 3, 2025 04:16
@yangzq50 yangzq50 mentioned this pull request Jan 6, 2025
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci PR can be test
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants